image: size request is always CONSTANT_SIZE

It's always -gtk-icon-size in both directions, even for paintables.
There's no width-for-height happening.

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index a817eed6793881d97b85ff5e0a31ada117f5a30e..502907e5fde9c18b0db177796633f2e68e5a447c 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -426,22 +426,6 @@ gtk_icon_helper_new (GtkCssNode *css_node,
   return self;
 }
 
-GtkSizeRequestMode
-gtk_icon_helper_get_request_mode (GtkIconHelper *self)
-{
-  switch (gtk_image_definition_get_storage_type (self->def))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
-
-    case GTK_IMAGE_ICON_NAME:
-    case GTK_IMAGE_GICON:
-    case GTK_IMAGE_EMPTY:
-    default:
-      return GTK_SIZE_REQUEST_CONSTANT_SIZE;
-    }
-}
-
 int
 gtk_icon_helper_get_size (GtkIconHelper *self)
 {

diff --git a/gtk/gtkiconhelperprivate.h b/gtk/gtkiconhelperprivate.h
index e2498f62d7c765b992af094c7fd91008f4dbc4ea..b7656bb849ad83f1ac42a3429104220b595c2b65 100644 (file)
--- a/gtk/gtkiconhelperprivate.h
+++ b/gtk/gtkiconhelperprivate.h
@@ -64,7 +64,6 @@ GdkPaintable *_gtk_icon_helper_peek_paintable (GtkIconHelper *self);
 GtkImageDefinition *gtk_icon_helper_get_definition (GtkIconHelper *self);
 const gchar *_gtk_icon_helper_get_icon_name (GtkIconHelper *self);
 
-GtkSizeRequestMode gtk_icon_helper_get_request_mode (GtkIconHelper *self);
 int gtk_icon_helper_get_size (GtkIconHelper *self);
 
 gboolean _gtk_icon_helper_get_force_scale_pixbuf (GtkIconHelper *self);

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 97df60c4e855118a74ca18764f0ea91c74774f2f..6be66f46da8f9c9040f599e5f933f89d609068bc 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -131,15 +131,6 @@ static GParamSpec *image_props[NUM_PROPERTIES] = { NULL, };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkImage, gtk_image, GTK_TYPE_WIDGET)
 
-static GtkSizeRequestMode
-gtk_image_get_request_mode (GtkWidget *widget)
-{
-  GtkImage *image = GTK_IMAGE (widget);
-  GtkImagePrivate *priv = gtk_image_get_instance_private (image);
-
-  return gtk_icon_helper_get_request_mode (priv->icon_helper);
-}
-
 static void
 gtk_image_class_init (GtkImageClass *class)
 {
@@ -154,7 +145,6 @@ gtk_image_class_init (GtkImageClass *class)
 
   widget_class = GTK_WIDGET_CLASS (class);
   widget_class->snapshot = gtk_image_snapshot;
-  widget_class->get_request_mode = gtk_image_get_request_mode;
   widget_class->measure = gtk_image_measure;
   widget_class->unrealize = gtk_image_unrealize;
   widget_class->style_updated = gtk_image_style_updated;